PHPC-2638 and PHPC-2630: Bump to libmongoc 2.1.2 and libmongocrypt 1.16.0#1868
PHPC-2638 and PHPC-2630: Bump to libmongoc 2.1.2 and libmongocrypt 1.16.0#1868jmikola merged 7 commits intomongodb:v2.xfrom
Conversation
7fe0f9e to
3f7be27
Compare
990c7fe to
a79eab9
Compare
|
Note: we've got two regularly failing builds on Windows 8.4 x86 (nts and ts) due to:
The most recent failures are at mongoc-handshake.c:702 but I'm not sure how pertinent that is. Will come back to this and investigate further. |
a79eab9 to
13515f7
Compare
This pulls in changes from MONGOCRYPT-845, which are necessary to produce a static build with both libmongoc 2.1.x and libmongocrypt (due to a conflict in the "mlib" headers).
9126259 to
2f95be6
Compare
7a3346a to
e398106
Compare
.gitmodules
Outdated
| url = https://github.com/jmikola/mongo-c-driver.git | ||
| ignore = untracked | ||
| branch = 2.1.2-handshake |
There was a problem hiding this comment.
Is the fix you added on your branch necessary for this PR?
There was a problem hiding this comment.
I'm still attempting to isolate the OOM compiler error in order to provide meaningful feedback to the C team. It's likely this is the result of ludicrous macro expansion in their BSON DSL (see mongoc-handshake.c in mongodb/mongo-c-driver@f142c61).
There was a problem hiding this comment.
Quoting How to: Enable a 64-Bit, x64 hosted MSVC toolset on the command line:
If you run into memory limits when you use the 32-bit tools, try the 64-bit tools.
Hat tip to @kevinAlbs.
This should avoid memory limits when using 32-bit tools, which is relevant for libmongoc sources using the BSON DSL API. If you run into memory limits when you use the 32-bit tools, try the 64-bit tools.
0543a2f to
d6ab8c9
Compare
* v2.x: (39 commits) Bump tests/drivers-evergreen-tools from `61cb4e9` to `5514d6a` (#1908) Bump tests/drivers-evergreen-tools from `514927f` to `61cb4e9` (#1906) Bump tests/drivers-evergreen-tools from `ebe98d0` to `514927f` (#1905) PHPC-2649: Update to libmongocrypt 1.17.0 (#1904) PHPC-2654: Update to libmongoc 2.2.1 (#1900) Bump tests/drivers-evergreen-tools from `c92d062` to `ebe98d0` (#1903) Bump actions/cache from 4 to 5 (#1902) Bump tests/drivers-evergreen-tools from `c83e428` to `c92d062` (#1899) Bump tests/drivers-evergreen-tools from `cb019f7` to `c83e428` (#1898) Bump actions/checkout from 5 to 6 (#1895) Bump tests/drivers-evergreen-tools from `f8ab2a5` to `cb019f7` (#1896) PHPC-2634: Binary vector corpus tests (#1892) Bump tests/drivers-evergreen-tools from `1dcbfe4` to `f8ab2a5` (#1891) PHPC-2638 and PHPC-2630: Bump to libmongoc 2.1.2 and libmongocrypt 1.16.0 (#1868) Fix git submodule command in CONTRIBUTING.md PHPC-2627: Use appropriate return type for zend_object_iterator_funcs.valid (#1890) Bump github/codeql-action from 3 to 4 (#1889) Bump tests/drivers-evergreen-tools from `3b3f081` to `1dcbfe4` (#1878) PHPC-2474: Support Binary vector subtype (#1853) Upload test results to codecov.io (#1857) ...
* v2.x: (40 commits) PHPC-2664: Drop Windows x86 builds (#1911) Bump tests/drivers-evergreen-tools from `61cb4e9` to `5514d6a` (#1908) Bump tests/drivers-evergreen-tools from `514927f` to `61cb4e9` (#1906) Bump tests/drivers-evergreen-tools from `ebe98d0` to `514927f` (#1905) PHPC-2649: Update to libmongocrypt 1.17.0 (#1904) PHPC-2654: Update to libmongoc 2.2.1 (#1900) Bump tests/drivers-evergreen-tools from `c92d062` to `ebe98d0` (#1903) Bump actions/cache from 4 to 5 (#1902) Bump tests/drivers-evergreen-tools from `c83e428` to `c92d062` (#1899) Bump tests/drivers-evergreen-tools from `cb019f7` to `c83e428` (#1898) Bump actions/checkout from 5 to 6 (#1895) Bump tests/drivers-evergreen-tools from `f8ab2a5` to `cb019f7` (#1896) PHPC-2634: Binary vector corpus tests (#1892) Bump tests/drivers-evergreen-tools from `1dcbfe4` to `f8ab2a5` (#1891) PHPC-2638 and PHPC-2630: Bump to libmongoc 2.1.2 and libmongocrypt 1.16.0 (#1868) Fix git submodule command in CONTRIBUTING.md PHPC-2627: Use appropriate return type for zend_object_iterator_funcs.valid (#1890) Bump github/codeql-action from 3 to 4 (#1889) Bump tests/drivers-evergreen-tools from `3b3f081` to `1dcbfe4` (#1878) PHPC-2474: Support Binary vector subtype (#1853) ...
* v2.x: (40 commits) PHPC-2664: Drop Windows x86 builds (#1911) Bump tests/drivers-evergreen-tools from `61cb4e9` to `5514d6a` (#1908) Bump tests/drivers-evergreen-tools from `514927f` to `61cb4e9` (#1906) Bump tests/drivers-evergreen-tools from `ebe98d0` to `514927f` (#1905) PHPC-2649: Update to libmongocrypt 1.17.0 (#1904) PHPC-2654: Update to libmongoc 2.2.1 (#1900) Bump tests/drivers-evergreen-tools from `c92d062` to `ebe98d0` (#1903) Bump actions/cache from 4 to 5 (#1902) Bump tests/drivers-evergreen-tools from `c83e428` to `c92d062` (#1899) Bump tests/drivers-evergreen-tools from `cb019f7` to `c83e428` (#1898) Bump actions/checkout from 5 to 6 (#1895) Bump tests/drivers-evergreen-tools from `f8ab2a5` to `cb019f7` (#1896) PHPC-2634: Binary vector corpus tests (#1892) Bump tests/drivers-evergreen-tools from `1dcbfe4` to `f8ab2a5` (#1891) PHPC-2638 and PHPC-2630: Bump to libmongoc 2.1.2 and libmongocrypt 1.16.0 (#1868) Fix git submodule command in CONTRIBUTING.md PHPC-2627: Use appropriate return type for zend_object_iterator_funcs.valid (#1890) Bump github/codeql-action from 3 to 4 (#1889) Bump tests/drivers-evergreen-tools from `3b3f081` to `1dcbfe4` (#1878) PHPC-2474: Support Binary vector subtype (#1853) ...
https://jira.mongodb.org/browse/PHPC-2638
https://jira.mongodb.org/browse/PHPC-2630
The libmongocrypt upgrade is necessary due to a collision between "mlib" headers in libmongoc and libmongocrypt (addressed in MONGOCRYPT-845).